diff --git a/plugin/Gallery/functions.php b/plugin/Gallery/functions.php index 768a892b1..141437116 100644 --- a/plugin/Gallery/functions.php +++ b/plugin/Gallery/functions.php @@ -1,672 +1,676 @@

" . $info[1] . ""; } else { echo "{$title}"; } ?>

'; return 0; } $page = $totalPages; $_REQUEST['current'] = $totalPages; } $videos = Video::getAllVideos("viewableNotUnlisted", false, $ignoreGroup); // need to add dechex because some times it return an negative value and make it fails on javascript playlists ?>
" . __("Up") . ""; $mostLess = $mostWord; } else { if (strpos($orderString, $getName . "=ASC")) { $tmpOrderString = substr($orderString, 0, strpos($orderString, $getName . "=ASC")) . $getName . "=DESC" . substr($orderString, strpos($orderString, $getName . "=ASC") + strlen($getName . "=ASC"), strlen($orderString)); } else { $tmpOrderString .= $getName . "=DESC"; } $upDown = "" . __("Down") . ""; $mostLess = $lessWord; } if (substr($tmpOrderString, strlen($tmpOrderString) - 1, strlen($tmpOrderString)) == "&") { $tmpOrderString = substr($tmpOrderString, 0, strlen($tmpOrderString) - 1); } return array($tmpOrderString, $upDown, $mostLess); } function createGallerySection($videos, $crc = "", $get = array(), $ignoreAds = false, $screenColsLarge = 0, $screenColsMedium = 0, $screenColsSmall = 0, $screenColsXSmall = 0) { global $global, $config, $obj, $advancedCustom, $advancedCustomUser; $countCols = 0; $obj = AVideoPlugin::getObjectData("Gallery"); $zindex = 1000; $startG = microtime(true); $program = AVideoPlugin::loadPluginIfEnabled('PlayLists'); foreach ($videos as $value) { // that meas auto generate the channelName if (empty($get) && !empty($obj->filterUserChannel)) { $getCN = array('channelName' => $value['channelName'], 'catName' => @$_GET['catName']); } else { $getCN = $get; } $img_portrait = (@$value['rotation'] === "90" || @$value['rotation'] === "270") ? "img-portrait" : ""; $name = User::getNameIdentificationById($value['users_id']); $name .= " " . User::getEmailVerifiedIcon($value['users_id']); // make a row each 6 cols if ($countCols % $obj->screenColsLarge === 0) { echo '
'; } $countCols++; if (!empty($screenColsLarge)) { $obj->screenColsLarge = $screenColsLarge; } if (!empty($screenColsMedium)) { $obj->screenColsMedium = $screenColsMedium; } if (!empty($screenColsSmall)) { $obj->screenColsSmall = $screenColsSmall; } if (!empty($screenColsXSmall)) { $obj->screenColsXSmall = $screenColsXSmall; } $colsClass = "col-lg-" . (12 / $obj->screenColsLarge) . " col-md-" . (12 / $obj->screenColsMedium) . " col-sm-" . (12 / $obj->screenColsSmall) . " col-xs-" . (12 / $obj->screenColsXSmall); $isserie = Video::isSerie($value['id']); $isserieClass = ""; if ($isserie) { $isserieClass = "isserie"; } ?>
thumbsGif = ""; $images->poster = "" . getCDN() . "view/img/notfound.jpg"; $images->thumbsJpg = "" . getCDN() . "view/img/notfoundThumbs.jpg"; $images->thumbsJpgSmall = "" . getCDN() . "view/img/notfoundThumbsSmall.jpg"; } if ($value['type'] === 'serie' && !empty($value['serie_playlists_id']) && stripos($images->thumbsJpg, 'notfound') !== false) { $images = PlayList::getRandomImageFromPlayList($value['serie_playlists_id']); } $startG = microtime(true); $imgGif = $images->thumbsGif; $poster = $images->thumbsJpg; ?>
<?php echo $value['title']; ?>" id="thumbsJPG" />


showCategoryTag)) { $iconClass = 'fas fa-folder'; if (!empty($value['iconClass'])) { $iconClass = $value['iconClass']; } $icon = ''; ?> showTags)) { echo implode('', Video::getTagsHTMLLabelArray($value['id'])); } @$timesG[__LINE__] += microtime(true) - $startG; $startG = microtime(true); ?>
doNotDisplayViews)) { if (AVideoPlugin::isEnabledByName('LiveUsers')) { echo getLiveUsersLabelVideo($value['id'], $value['views_count'], "", ""); } else { ?>
- Description)) { - //$desc = str_replace(array('"', "'", "#", "/", "\\"), array('``', "`", "", "", ""), preg_replace("/\r|\n/", " ", nl2br(trim($value['description'])))); - $desc = nl2br(trim($value['description'])); - if (!empty($desc)) { - $duid = uniqid(); - $titleAlert = str_replace(array('"', "'"), array('``', "`"), $value['title']); - ?> +
+ Description)) { + //$desc = str_replace(array('"', "'", "#", "/", "\\"), array('``', "`", "", "", ""), preg_replace("/\r|\n/", " ", nl2br(trim($value['description'])))); + $desc = nl2br(trim($value['description'])); + if (!empty($desc)) { + $duid = uniqid(); + $titleAlert = str_replace(array('"', "'"), array('``', "`"), $value['title']); + ?> +
"> - + -
+ } + ?>
- - + "> +
1) { if ($countCols % $obj->screenColsLarge === 0) { echo ""; } if ($countCols % $obj->screenColsMedium === 0) { echo ""; } if ($countCols % $obj->screenColsSmall === 0) { echo ""; } if ($countCols % $obj->screenColsXSmall === 0) { echo ""; } } } ?>
screenColsLarge === 0) { echo '
'; } $countCols++; if (!empty($screenColsLarge)) { $obj->screenColsLarge = $screenColsLarge; } if (!empty($screenColsMedium)) { $obj->screenColsMedium = $screenColsMedium; } if (!empty($screenColsSmall)) { $obj->screenColsSmall = $screenColsSmall; } if (!empty($screenColsXSmall)) { $obj->screenColsXSmall = $screenColsXSmall; } $colsClass = "col-lg-" . (12 / $obj->screenColsLarge) . " col-md-" . (12 / $obj->screenColsMedium) . " col-sm-" . (12 / $obj->screenColsSmall) . " col-xs-" . (12 / $obj->screenColsXSmall); if (!empty($video['className'])) { $colsClass .= " {$video['className']}"; } $liveNow = '' . __("LIVE NOW") . ''; ?>
<?php echo $video['title'] ?>

showCategoryTag)) { ?>
- Description)) { - $desc = str_replace(array('"', "'", "#", "/", "\\"), array('``', "`", "", "", ""), preg_replace("/\r|\n/", " ", nl2br(trim($video['description'])))); - if (!empty($desc)) { - $titleAlert = str_replace(array('"', "'"), array('``', "`"), $video['title']); - ?> - "> -
+ Description)) { + $desc = str_replace(array('"', "'", "#", "/", "\\"), array('``', "`", "", "", ""), preg_replace("/\r|\n/", " ", nl2br(trim($video['description'])))); + if (!empty($desc)) { + $titleAlert = str_replace(array('"', "'"), array('``', "`"), $video['title']); + ?> +
+ "> +
+
1) { if ($countCols % $obj->screenColsLarge === 0) { echo ""; } if ($countCols % $obj->screenColsMedium === 0) { echo ""; } if ($countCols % $obj->screenColsSmall === 0) { echo ""; } if ($countCols % $obj->screenColsXSmall === 0) { echo ""; } } } ?>
'; } unset($_POST['disableAddTo']); return $countCols; } function createChannelItem($users_id, $photoURL = "", $identification = "", $rowCount = 12) { $total = Video::getTotalVideos("viewable", $users_id); if (empty($total)) { return false; } if (empty($photoURL)) { $photoURL = User::getPhoto($users_id); } if (empty($identification)) { $identification = User::getNameIdentificationById($users_id); } ?>

Channel Owner

"; return $countCols; } function canPrintCategoryTitle($title) { global $doNotRepeatCategoryTitle; if (!isset($doNotRepeatCategoryTitle)) { $doNotRepeatCategoryTitle = array(); } if (in_array($title, $doNotRepeatCategoryTitle)) { return false; } $doNotRepeatCategoryTitle[] = $title; return true; } ?> diff --git a/plugin/Gallery/style.css b/plugin/Gallery/style.css index bd1ac9c36..e674d875b 100644 --- a/plugin/Gallery/style.css +++ b/plugin/Gallery/style.css @@ -1,208 +1,209 @@ .gallery .duration { position: absolute; background: rgba(0, 0, 0, 0.6)!important; padding: 3px; color: #FFF; top: 5px; left: 25px; font-size: 0.9em; border-radius: 5px; } .gallery h2, .videosDetails .title { font-size: 1em; margin: 0; padding: 0; overflow: hidden; text-overflow: ellipsis; display: -webkit-box; line-height: 16px; /* fallback */ max-height: 32px; /* fallback */ min-height: 32px; /* fallback */ -webkit-line-clamp: 2; /* number of lines to show */ -webkit-box-orient: vertical; } .gallery .watch-view-count { font-size: 0.8em; font-weight: normal; border: 0; margin: 0; padding: 0; } .galleryVideo .group { overflow: hidden; text-overflow: ellipsis; } .mainArea{ padding: 15px; } h3.galleryTitle{ padding: 15px 5px; } .aspectRatio16_9 { position: relative; display: block; width: 100%; height: 0; padding-bottom: 56.25%; overflow: hidden; } .aspectRatio16_9 img{ text-indent:-9999px; width: 100%; display: block; margin-left: auto; margin-right: auto; } .thumbsGIF{ text-indent:-9999px; width: 100%; margin-left: auto; margin-right: auto; } .firstRow{ margin-bottom: 10px; padding-bottom: 25px; border-bottom: solid 1px #EEE; } .galeryDetails div{ float: left; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; padding-right: 5px; font-size: 0.7em; + margin: 1px; } .firstRow .galeryDetails div{ font-size: 1em; } .galeryDetails div.userName{ width: 100%; } .fixPadding{ padding: 0 5px; } .popover-content, .popover-content>div{ white-space: normal !important; width: auto; color: inherit !important; } .popover-content>div{ overflow-y: auto; height: 140px; } .mainAreaDescription{ position:relative; height:100%; width: 110%; padding-right: 10%; overflow-x:hidden; overflow-y:scroll; max-height: 17vw; } .mainAreaDescriptionContainer{ position: relative; overflow: hidden; } a.h6{ text-decoration: none !important; } .popover-title { color: black; font-size: 1em; } .popover-content{ color: black !important; font-size: 0.8em; } .gallery .label{ border-radius: 0; } .gallery .label:first-child{ border-top-left-radius: 0.25em; border-bottom-left-radius: 0.25em; } .gallery .label:last-child{ border-top-right-radius: 0.25em; border-bottom-right-radius: 0.25em; } .galleryTitle a.btn-default:hover{ background-color: transparent; } .galeryRowElement .galleryVideo { margin-bottom: 10px; } .galleryVideoButtons{ position: absolute; right: 5px; top: 5px; z-index: 1025; display: none; } .galleryVideo .galleryVideoButtons button{ opacity: 0.5; } .galleryVideo:hover .galleryVideoButtons{ display: block !important; } .galleryVideo .galleryVideoButtons button:hover{ opacity: 1; } .gallerySerieOverlay{ position: absolute; left: 0; top: 0; z-index: 1020; width: 100%; height: 100%; background-color: rgba(0,0,0,0); color: rgba(0,0,0,0); -webkit-box-align:center; -webkit-box-pack:center; display:-webkit-box; font-weight: bold; } .gallerySerieOverlay:hover{ background-color: rgba(0,0,0,0.5); color: #FFF; } .gallerySerieOverlayTotal{ position: absolute; right: 0; top: 0; width: 25%; height: 100%; background-color: rgba(0,0,0,0.5); color: #FFF; -webkit-box-align:center; -webkit-box-pack:center; display:-webkit-box; font-weight: bold; } .galleryTags .label{ display: table-cell; font-size: 0.9em; } .galleryTags{ margin: 1px; } \ No newline at end of file diff --git a/plugin/Live/indexCol1.php b/plugin/Live/indexCol1.php index c4e83edad..373479217 100644 --- a/plugin/Live/indexCol1.php +++ b/plugin/Live/indexCol1.php @@ -1,64 +1,64 @@
- \ No newline at end of file